From: Wei Liu <wei.liu2@citrix.com>
Date: Wed, 25 Feb 2015 14:56:00 +0000 (+0000)
Subject: libxl: fix off-by-one error in JSON parser
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3686
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1391ca3bfa6555deefa3df620e1aa824652329f5;p=xen.git

libxl: fix off-by-one error in JSON parser

We need a sentinel slot in the generated libxl_key_value_list.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c
index ceb014a323..98335b05b2 100644
--- a/tools/libxl/libxl_json.c
+++ b/tools/libxl/libxl_json.c
@@ -247,7 +247,7 @@ int libxl__key_value_list_parse_json(libxl__gc *gc, const libxl__json_object *o,
 
     maps = libxl__json_object_get_map(o);
     size = maps->count * 2;
-    kvl = *p = libxl__calloc(NOGC, size, sizeof(char *));
+    kvl = *p = libxl__calloc(NOGC, size+1, sizeof(char *));
 
     for (i = 0; i < maps->count; i++) {
         int idx = i * 2;